[Port] Port Nanotrasen Representative (NTR) and Blueshield Officer (BSO) #20

CerberusWolfie · 2025-01-04T05:55:50Z

Description

This will port the Nanotrasen Representative (NTR) and Blueshield Officer (BSO) to Goob MRP. Along with this will come their signature items, lockers, clothing, time requirements (same as LRP), and unique accesses.

This adds (by cherry-picking) almost every commit that involved the NTR and BSO individually and together. There is some content missing that I've chosen to not include either due to it being partially attached and/or not having the components in Einstein Engines.

TODO

Below are breakups of my TODO that have either been completed, are in-progress, or are waiting on other PRs.

Completed So Far

Known Problems

EG-4 bullets show errors, need to fix.
Nanotrasen Representative Jumpskirt doesn't show on body.
NTR and BSO Dresser do not fill despite having StorageFill component same as locker.

TODO

Create loadouts for NTR and BSO.
Create restrictions for NTR and BSO (specifically mirroring Shadowkin being banned from Command. (?)
Check and ensure playtime requirements work.

TODO, Waiting on Other PRs (from Upstream)

Map job spawns on every map. (future PR, waiting on map updates)
Map unique lockers on ever map. (future PR, waiting on map updates, potentially fulfilled with previous)
Map unique CentComm offices, (future PR, potentially fulfilled with last one)

Media

Dev - Sandbox Screenshots

Lobby Screenshots

Changelog

🆑

add: Ported Nanotrasen Representative (NTR) and Blueshield Officer (BSO)

…flicts.

Added Centcom Backpack for Nanotrasen rep

…ually due to weird conflictions when cherry-picking it.

… jumpskirts.yml

fix ntr access issue

…douts. Fixing NTR ID as well, currently commented out.

… (4ba2c0d - 4ba2c0d4e5c123546de9a2b3072ac16a2e96abab).

…mit.

…en renaming as needed.

…cts that have no sprite for this port. Fixed a couple of typos. Commented out loadouts that do not work in EE (will transfer to EE's style later).

…issed.

…sprites.

…s removes the entityTables for the lockers and dressers and replaces them with the old component (EE doesn't have the entityTables). This also removes the Execution and Contraband components from items because they don't have that. This fixes a typo in the backpack for Blueshield Officer, and sets the texture lines to use the new renamed directory.

* blueshieldofficer resprite * BSO resprite V2

* Add nanotrasen representative jumpsuit/skirt and job icon * Skirt sprite diff, + more loadout options :) * Oops! * Update dress texture

…have the sprites for them).

…ake).

github-actions · 2025-01-04T05:56:28Z

RSI Diff Bot; head commit 2ad123c merging into c436dde
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Effects/acidifier.rsi

State	Old	New	Status
acid			Modified

Resources/Textures/Objects/Misc/bureaucracy.rsi

State	Old	New	Status
paper_stamp-nanorep			Added

Resources/Textures/_Goobstation/Clothing/Armor/bso_armour.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Back/Backpacks/blueshield.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Back/Backpacks/centcom.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Back/Duffels/blueshield.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Back/Satchels/blueshield.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Back/Satchels/nanorep.rsi

State	Old	New	Status
equipped-BACKPACK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Eyes/Glasses/medglasses.rsi

State	Old	New	Status
equipped-EYES			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Head/Hardsuits/bso.rsi

State	Old	New	Status
icon-flash			Added
icon			Added
off-equipped-HELMET-vox			Added
off-equipped-HELMET			Added
on-equipped-HELMET-vox			Added
on-equipped-HELMET			Added

Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_bso_navy.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Head/Hats/beret_bso_officer.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Neck/Mantle/bsomantle.rsi

State	Old	New	Status
equipped-NECK			Added
icon			Added

Resources/Textures/_Goobstation/Clothing/OuterClothing/Armor/blueshield_jacket.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/OuterClothing/Hardsuits/bso.rsi

State	Old	New	Status
equipped-OUTERCLOTHING-vox			Added
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/blueshield_officer.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/centcom_agent.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/nanotrasen_representative.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Added
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_shirt.rsi

State	Old	New	Status
equipped-INNERCLOTHING-monkey			Added
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/nanotrasen_representative.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_Goobstation/Effects/bluespace_lifeline.rsi

State	Old	New	Status
bluespace_lifeline			Added

Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi

State	Old	New	Status
blueshield			Added
nanotrasenrepresentative			Added

Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi

State	Old	New	Status
bso			Added
ntr			Added
standard			Added

Resources/Textures/_Goobstation/Objects/Misc/stamps.rsi

State	Old	New	Status
stamp-nanorep			Added

Resources/Textures/_Goobstation/Objects/Specific/Medical/nt_implanter.rsi

State	Old	New	Status
broken			Added
implanter0			Added
implanter1			Added

Resources/Textures/_Goobstation/Objects/Tools/handheld_fax.rsi

State	Old	New	Status
icon			Added
idle			Added
inhand-left			Added
inhand-right			Added
inserting			Added
printing			Added
scanner			Added

Resources/Textures/_Goobstation/Objects/Weapons/Guns/Battery/erevolver.rsi

State	Old	New	Status
base			Added
disabler-inhand-left			Added
disabler-inhand-right			Added
equipped-BACKPACK			Added
equipped-BELT			Added
equipped-SUITSTORAGE			Added
icon			Added
lethal-inhand-left			Added
lethal-inhand-right			Added
mag-unshaded-0			Added
mag-unshaded-1			Added
mag-unshaded-2			Added
mag-unshaded-3			Added
mag-unshaded-4			Added
mode-disabler			Added
mode-lethal			Added

Resources/Textures/_Goobstation/Structures/Storage/closet.rsi

State	Old	New	Status
bso			Added
bso_door			Added
bso_open			Added
generic			Added
generic_door			Added
generic_icon			Added
generic_open			Added
locked			Added
ntr			Added
ntr_door			Added
ntr_open			Added
unlocked			Added
welded			Added

Edit: diff updated after 2ad123c

… problems were not related to this and have been fixed separately.

github-actions · 2025-01-04T23:51:22Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

Aidenkrz · 2025-01-12T01:43:00Z

guh... guess its being added upstream..............................

Aidenkrz and others added 30 commits January 3, 2025 11:20

Add blueshield and ntr

a1171af

Change to CharacterDepart... to fit the role creation.

1c90b1c

Add more flavor comment.

365971c

Fix blueshield and ntr backpacks

60b9564

Cherry-Pick the commit 3989974 (3989974647) from Goob LRP and fix con…

ea35a10

…flicts.

Update nanotrasen_representative.yml

7e06c74

give ntr cc access

275f903

Merge pull request #272 from Teapug/master

d81bf84

Added Centcom Backpack for Nanotrasen rep

NTR spawns with nanotrasen representative satchel now

811d5e2

Had to forcefully commit 1870a312be006dce8baae36f14dec877a8acb177 man…

56e0ed6

…ually due to weird conflictions when cherry-picking it.

Cherry-Picking 1b79de9 (1b79de95dd) from GoobLRP, had to manually fix…

528c92b

… jumpskirts.yml

Cherry-Pick Commit 8a03dfb (8a03dfb911) and accept a character change.

a8b9eff

Change the Department time to CharacterDepartm... as needed.

0f50efd

Fix NTR access bug (#455)

b6a2e19

fix ntr access issue

Cherry-Pick 97e8824 (97e8824a2f) and fix conflicts.

6a042e7

Fix jobIcon -> statusIcon for EE.

b6b7600

Fix the merge conflict on techAssist and secCadet and comment out loa…

2b4cd06

…douts. Fixing NTR ID as well, currently commented out.

Rename all the files to follow the rename in PR (on Goob LRP GH) #689…

47f6c28

… (4ba2c0d - 4ba2c0d4e5c123546de9a2b3072ac16a2e96abab).

Fix naming schema for entitites prior to testing.

df25100

Cherry-Pick 1f37558 (1f3755809d) from Goob LRP. Will fix in later com…

8bd96e3

…mit.

Temp rename to grab older resources.

36df507

Cherry-Pick b66ae2f (b66ae2fcb4) from Goob LRP. Fixing changes and th…

6e53044

…en renaming as needed.

Rename the directories.

beb78c3

Renamed all the dependencies to match the name change. Deleted artifa…

cb284ea

…cts that have no sprite for this port. Fixed a couple of typos. Commented out loadouts that do not work in EE (will transfer to EE's style later).

Rename for the umpteenth time to cherry-pick an older commit that I m…

be9b0d4

…issed.

Cherry-Pick f412ad2 (f412ad2c61) from Goob LRP for the remaining BSO …

68cb287

…sprites.

Rename back to _Goobstation. PLEASE LET THIS BE THE LAST TIME!

aace1bc

Fixed the Jumpskirt for BSO.

2bacf62

Made BSO uniform more blue (#667)

fcd922f

* blueshieldofficer resprite * BSO resprite V2

Aidenkrz and others added 16 commits January 3, 2025 21:27

NTR Skirt Change (#500)

95efa5b

* Add nanotrasen representative jumpsuit/skirt and job icon * Skirt sprite diff, + more loadout options :) * Oops! * Update dress texture

Rename back.

c27370e

Security Status partial PR.

6d44a09

Cherry-Pick b19945c (b19945c394) and fix merge conflict.

4042f2c

Rename for EG-4 cherry-pick.

f94f5cf

Cherry-Pick 64d84d2 (64d84d2127) and add the gun to pocket.

401f720

Rename back.

6041c65

Cherry-Pick 49d5a9f (49d5a9fd03) and solve merge conflict.

6f09149

Remove the gun that isn't in my files.

d935160

Cherry-Pick f1cff42 (f1cff42058) but remove the extra doors (I don't …

dee8ead

…have the sprites for them).

Cherry-Pick 348757d (348757d7c7) and comment out loadouts (for EE rem…

5a25c9d

…ake).

Remove Contraband tags, they're not in EE.

402d012

Rename to fix the NTR Satchel with the most elite cherry-pick.

a849aab

Cherry-Pick fe29176 (fe291765f5) to fix the Satchels for NTR.

d25d01f

Rename back and test.

0ea621e

Fix the base texture of the gun.

798763e

github-actions bot added Changes: YML Changes: C# Changes: Localization Changes: Sprite Changes: Audio Changes: Map labels Jan 4, 2025

CerberusWolfie added 2 commits January 4, 2025 00:00

Fix the unique_teleporters.yml to use the previous version of it. The…

71fffef

… problems were not related to this and have been fixed separately.

Fix the jumpskirt (once again) because it undid my earlier change?!

2ad123c

github-actions bot added the Status: Merge Conflict label Jan 4, 2025

Aidenkrz closed this Jan 12, 2025

CerberusWolfie deleted the NTR-BSO-REAL branch January 18, 2025 00:58

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[Port] Port Nanotrasen Representative (NTR) and Blueshield Officer (BSO) #20

[Port] Port Nanotrasen Representative (NTR) and Blueshield Officer (BSO) #20

CerberusWolfie commented Jan 4, 2025 •

edited

Loading

github-actions bot commented Jan 4, 2025 •

edited

Loading

github-actions bot commented Jan 4, 2025

Aidenkrz commented Jan 12, 2025

[Port] Port Nanotrasen Representative (NTR) and Blueshield Officer (BSO) #20

[Port] Port Nanotrasen Representative (NTR) and Blueshield Officer (BSO) #20

Conversation

CerberusWolfie commented Jan 4, 2025 • edited Loading

Description

TODO

Completed So Far

Known Problems

TODO

TODO, Waiting on Other PRs (from Upstream)

Media

Dev - Sandbox Screenshots

Lobby Screenshots

Changelog

github-actions bot commented Jan 4, 2025 • edited Loading

github-actions bot commented Jan 4, 2025

Aidenkrz commented Jan 12, 2025

CerberusWolfie commented Jan 4, 2025 •

edited

Loading

github-actions bot commented Jan 4, 2025 •

edited

Loading